From: robertlipe <robertlipe@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Tue, 30 Jun 2015 15:33:18 +0000 (+0000)
Subject: Clear buff in csv_writer to that successive lines modifiying buff don't
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~10^2~27
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=42a7567c4cfcb769052f155ca327f640c8cbc16e;p=gpsbabel.git

Clear buff in csv_writer to that successive lines modifiying buff don't
pick up a stale value.
From rickrich: gpsbabel -i gpx -f geocache.gpx -o tabsep -F -
---

diff --git a/gpsbabel/csv_util.cc b/gpsbabel/csv_util.cc
index 7acde3c49..70510f29f 100644
--- a/gpsbabel/csv_util.cc
+++ b/gpsbabel/csv_util.cc
@@ -2151,6 +2151,7 @@ xcsv_waypt_pr(const Waypoint* wpt)
       /* print the enclosing character(s) */
       gbfputs(xcsv_file.record_delimiter, xcsv_file.xcsvfp);
     }
+    buff.clear();
   }
 
   gbfputs(xcsv_file.record_delimiter, xcsv_file.xcsvfp);
diff --git a/gpsbabel/internal_styles.cc b/gpsbabel/internal_styles.cc
index a1dc8ce55..1eb9408b9 100644
--- a/gpsbabel/internal_styles.cc
+++ b/gpsbabel/internal_styles.cc
@@ -56,7 +56,7 @@ static char csv[] =
   "# Author: Alex Mottram\n"
   "#   Date: 12/09/2002\n"
   "#\n"
-  "# \n"
+  "#\n"
   "DESCRIPTION	Comma separated values\n"
   "SHORTLEN	8\n"
   "#\n"
@@ -176,7 +176,7 @@ static char custom[] =
   "IFIELD	TIMET_TIME, \"\", \"%ld\"\n"
   "IFIELD	EXCEL_TIME, \"\", \"%f\"\n"
 
-  "# EPILOGUE: \n"
+  "# EPILOGUE:\n"
   "EPILOGUE	Epilogue Line 1\n"
   "EPILOGUE	Epilogue Line 2\n"
   ;
@@ -187,7 +187,7 @@ static char dna[] =
   "# Author: Alex Mottram\n"
   "#   Date: 12/09/2002\n"
   "#\n"
-  "# \n"
+  "#\n"
   "# As defined in dna.c\n"
   "#\n"
   "#\n"
@@ -247,7 +247,7 @@ static char fugawi[] =
   "# Author: Robert Lipe, Patrick Ohly\n"
   "#   Date: 07/24/2005\n"
   "#\n"
-  "# \n"
+  "#\n"
 
   "DESCRIPTION		Fugawi\n"
   "EXTENSION		txt\n"
@@ -303,7 +303,7 @@ static char garmin301[] =
   "#\n"
   "# HEADER STUFF:\n"
   "#\n"
-  "PROLOGUE	Garmin 301 data __FILE__ \n"
+  "PROLOGUE	Garmin 301 data __FILE__\n"
   "PROLOGUE	Timestamp,Latitude, Longitude, Altitude(ft), heart rate\n"
   "#\n"
   "# INDIVIDUAL DATA FIELDS:\n"
@@ -315,7 +315,7 @@ static char garmin301[] =
   "IFIELD  HEART_RATE,\"\",\" %d\"	# beats per minute\n"
 
 
-  "# EPILOGUE: \n"
+  "# EPILOGUE:\n"
   "#EPILOGUE	Epilogue Line 1\n"
   "#EPILOGUE	Epilogue Line 2\n"
   ;
@@ -343,82 +343,82 @@ static char garmin_g1000[] =
   "#\n"
   "# HEADER\n"
   "#\n"
-  "PROLOGUE airframe_info, log_version=\"1.00\", airframe_name=\"Cessna 182T\", unit_software_part_number=\"\", unit_software_version=\"12.03\", system_software_part_number=\"\", system_id=\"\", mode=NORMAL, \n"
+  "PROLOGUE airframe_info, log_version=\"1.00\", airframe_name=\"Cessna 182T\", unit_software_part_number=\"\", unit_software_version=\"12.03\", system_software_part_number=\"\", system_id=\"\", mode=NORMAL,\n"
   "PROLOGUE yyyy-mm-dd, hh:mm:ss,   hh:mm,  ident,      degrees,      degrees, ft Baro,  inch,  ft msl, deg C,     kt,     kt,     fpm,    deg,    deg,      G,      G,   deg,   deg, volts, volts,  amps,  amps,   gals,   gals,      gph,   deg F,     psi,     Hg,    rpm,   deg F,   deg F,   deg F,   deg F,   deg F,   deg F,   deg F,   deg F,   deg F,   deg F,   deg F,   deg F,  ft wgs,  kt, enum,    deg,    MHz,    MHz,     MHz,     MHz,    fsd,    fsd,     kt,   deg,     nm,    deg,    deg,   bool,  enum,   enum,   deg,   deg,   fpm,   enum,   mt,    mt,     mt,    mt,     mt\n"
   "PROLOGUE Lcl Date, Lcl Time, UTCOfst, AtvWpt,     Latitude,    Longitude,    AltB, BaroA,  AltMSL,   OAT,    IAS, GndSpd,    VSpd,  Pitch,   Roll,  LatAc, NormAc,   HDG,   TRK, volt1, volt2,  amp1,  amp2,  FQtyL,  FQtyR, E1 FFlow, E1 OilT, E1 OilP, E1 MAP, E1 RPM, E1 CHT1, E1 CHT2, E1 CHT3, E1 CHT4, E1 CHT5, E1 CHT6, E1 EGT1, E1 EGT2, E1 EGT3, E1 EGT4, E1 EGT5, E1 EGT6,  AltGPS, TAS, HSIS,    CRS,   NAV1,   NAV2,    COM1,    COM2,   HCDI,   VCDI, WndSpd, WndDr, WptDst, WptBrg, MagVar, AfcsOn, RollM, PitchM, RollC, PichC, VSpdG, GPSfix,  HAL,   VAL, HPLwas, HPLfd, VPLwas\n"
 
   "#\n"
   "# INDIVIDUAL DATA FIELDS:\n"
   "#\n"
-  "IFIELD GMT_TIME,\"\",\"%Y-%m-%d\" 		#Lcl Date, \n"
-  "IFIELD HMSG_TIME,\"\",\"%d:%d:%d %s\"  	#Lcl Time, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#UTCOfst, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#AtvWpt,     \n"
-  "IFIELD LAT_DECIMAL, \"\", \"%f\"  		#Latitude,    \n"
-  "IFIELD LON_DECIMAL, \"\", \"%f\"  		#Longitude,    \n"
-  "IFIELD ALT_FEET,\"\",\"%.0f\"  			#AltB, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#BaroA,  \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#AltMSL,   \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#OAT,    \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#IAS, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#GndSpd,    \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#VSpd,  \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#Pitch,   \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#Roll,  \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#LatAc, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#NormAc,   \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#HDG,   \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#TRK, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#volt1, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#volt2,  \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#amp1,  \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#amp2,  \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#FQtyL,  \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#FQtyR, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#E1 FFlow, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#E1 OilT, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#E1 OilP, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#E1 MAP, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#E1 RPM, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#E1 CHT1, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#E1 CHT2, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#E1 CHT3, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#E1 CHT4, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#E1 CHT5, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#E1 CHT6, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#E1 EGT1, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#E1 EGT2, \n"
-  "IFIELD IGNORE,\"\",\"%s\" 			 	#E1 EGT3, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#E1 EGT4, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#E1 EGT5, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#E1 EGT6,  \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#E1 TIT1,  \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#AltGPS, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#TAS, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#HSIS,    \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#CRS,   \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#NAV1,   \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#NAV2,    \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#COM1,    \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#COM2,   \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#HCDI,   \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#VCDI, \n"
-  "IFIELD IGNORE,\"\",\"%s\" 				#WndSpd, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#WndDr, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#WptDst, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#WptBrg, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#MagVar, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#AfcsOn, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#RollM, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#PitchM, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#RollC, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#PichC, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#VSpdG, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#GPSfix,  \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#HAL,   \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#VAL, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#HPLwas, \n"
-  "IFIELD IGNORE,\"\",\"%s\"  				#HPLfd, \n"
+  "IFIELD GMT_TIME,\"\",\"%Y-%m-%d\" 		#Lcl Date,\n"
+  "IFIELD HMSG_TIME,\"\",\"%d:%d:%d %s\"  	#Lcl Time,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#UTCOfst,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#AtvWpt,\n"
+  "IFIELD LAT_DECIMAL, \"\", \"%f\"  		#Latitude,\n"
+  "IFIELD LON_DECIMAL, \"\", \"%f\"  		#Longitude,\n"
+  "IFIELD ALT_FEET,\"\",\"%.0f\"  			#AltB,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#BaroA,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#AltMSL,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#OAT,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#IAS,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#GndSpd,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#VSpd,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#Pitch,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#Roll,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#LatAc,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#NormAc,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#HDG,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#TRK,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#volt1,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#volt2,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#amp1,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#amp2,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#FQtyL,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#FQtyR,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#E1 FFlow,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#E1 OilT,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#E1 OilP,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#E1 MAP,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#E1 RPM,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#E1 CHT1,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#E1 CHT2,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#E1 CHT3,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#E1 CHT4,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#E1 CHT5,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#E1 CHT6,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#E1 EGT1,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#E1 EGT2,\n"
+  "IFIELD IGNORE,\"\",\"%s\" 			 	#E1 EGT3,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#E1 EGT4,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#E1 EGT5,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#E1 EGT6,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#E1 TIT1,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#AltGPS,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#TAS,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#HSIS,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#CRS,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#NAV1,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#NAV2,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#COM1,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#COM2,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#HCDI,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#VCDI,\n"
+  "IFIELD IGNORE,\"\",\"%s\" 				#WndSpd,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#WndDr,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#WptDst,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#WptBrg,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#MagVar,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#AfcsOn,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#RollM,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#PitchM,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#RollC,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#PichC,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#VSpdG,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#GPSfix,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#HAL,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#VAL,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#HPLwas,\n"
+  "IFIELD IGNORE,\"\",\"%s\"  				#HPLfd,\n"
   "IFIELD IGNORE,\"\",\"%s\"  				#VPLwas\n"
   ;
 static char garmin_poi[] =
@@ -515,7 +515,7 @@ static char gpsdrive[] =
   "# Author: Alex Mottram\n"
   "#   Date: 12/11/2002\n"
   "#\n"
-  "# \n"
+  "#\n"
   "#\n"
 
   "DESCRIPTION		GpsDrive Format\n"
@@ -549,7 +549,7 @@ static char gpsdrivetrack[] =
   "# Author: Tobias Minich\n"
   "#   Date: 12/07/2005\n"
   "#\n"
-  "# \n"
+  "#\n"
   "#\n"
 
   "DESCRIPTION		GpsDrive Format for Tracks\n"
@@ -581,7 +581,7 @@ static char gpsman[] =
   "# Author: Alex Mottram\n"
   "#   Date: 12/09/2002\n"
   "#\n"
-  "# \n"
+  "#\n"
   "# As defined in gpsman.c\n"
   "#\n"
   "#\n"
@@ -741,7 +741,7 @@ static char kompass_tk[] =
   "# Author: Olaf Klein\n"
   "#   Date: 01/10/2007\n"
   "#\n"
-  "# \n"
+  "#\n"
   "DESCRIPTION		Kompass (DAV) Track (.tk)\n"
   "DATATYPE		TRACK\n"
   "EXTENSION		wp\n"
@@ -761,7 +761,7 @@ static char kompass_wp[] =
   "# Author: Olaf Klein\n"
   "#   Date: 01/10/2007\n"
   "#\n"
-  "# \n"
+  "#\n"
   "DESCRIPTION		Kompass (DAV) Waypoints (.wp)\n"
   "DATATYPE		WAYPOINT\n"
   "EXTENSION		wp\n"
@@ -833,7 +833,7 @@ static char mainnav[] =
   "# Author: tsteven4\n"
   "# Date: December 13, 2012\n"
   "#\n"
-  "# \n"
+  "#\n"
   "DESCRIPTION	Mainnav\n"
   "EXTENSION	nav\n"
   "DATATYPE	TRACK\n"
@@ -947,7 +947,7 @@ static char mxf[] =
   "# Author: Alex Mottram\n"
   "#   Date: 12/09/2002\n"
   "#\n"
-  "# \n"
+  "#\n"
   "# As used in mxf.c\n"
   "#\n"
   "#\n"
@@ -1065,7 +1065,7 @@ static char nima[] =
   "IFIELD	IGNORE, \"\", \"%s\"		# LC\n"
   "IFIELD	IGNORE, \"\", \"%s\"		# SHORT_FORM\n"
   "IFIELD	IGNORE, \"\", \"%s\"		# GENERIC\n"
-  "IFIELD	SHORTNAME, \"\", \"%s\"		# SORT_NAME \n"
+  "IFIELD	SHORTNAME, \"\", \"%s\"		# SORT_NAME\n"
   "IFIELD	IGNORE, \"\", \"%s\"		# FULL_NAME (unicoded!)\n"
   "IFIELD	DESCRIPTION, \"\", \"%s\"		# FULL_NAME_ND\n"
   "IFIELD	IGNORE, \"\", \"%s\"		# MODIFY_DATE\n"
@@ -1141,7 +1141,7 @@ static char s_and_t[] =
   "# Author: Alex Mottram\n"
   "#   Date: 12/09/2002\n"
   "#\n"
-  "# \n"
+  "#\n"
   "# As requested by Noel Shrum on the gpsbabel-code mailing list.\n"
   "# Name,Latitude,Longitude,Name 2,URL,Type\n"
   "# GCCBF,44.479133,-85.56515,High Rollaway by rjlint,http://www.geocaching.com/seek/cache_details.aspx?ID=3263,Traditional Cache\n"
@@ -1180,7 +1180,7 @@ static char s_and_t[] =
 static char saplus[] =
   "# gpsbabel XCSV style file\n"
   "#\n"
-  "# Format: \n"
+  "# Format:\n"
   "# Author: Jim Bensman\n"
   "#   Date: 02/22/04\n"
   "#\n"
@@ -1238,7 +1238,7 @@ static char tabsep[] =
   "IFIELD	SHORTNAME, \"\", \"%s\"\n"
   "IFIELD	DESCRIPTION, \"\", \"%s\"\n"
   "IFIELD	NOTES, \"\", \"%s\"\n"
-  "IFIELD	URL, \"\", \"%s\" 		\n"
+  "IFIELD	URL, \"\", \"%s\"\n"
   "IFIELD	URL_LINK_TEXT, \"\", \"%s\"\n"
   "IFIELD	ICON_DESCR, \"\", \"%s\"\n"
   "IFIELD	LAT_DECIMAL, \"\", \"%f\"\n"
@@ -1352,7 +1352,7 @@ static char xmap[] =
   "# Author: Alex Mottram\n"
   "#   Date: 12/09/2002\n"
   "#\n"
-  "# \n"
+  "#\n"
   "# As defined in csv.c/xmap\n"
   "#\n"
 
@@ -1386,10 +1386,10 @@ static char xmap2006[] =
   "# Author: Pasha Phares\n"
   "#   Date: 5/5/2006\n"
   "#\n"
-  "# Amazingly, 2006 won't read the \"COMMASPACE\" that we used in \n"
+  "# Amazingly, 2006 won't read the \"COMMASPACE\" that we used in\n"
   "# in Xmap prior to this and versions before 2006 won't read files\n"
   "# separated by only a comma.\n"
-  "# \n"
+  "#\n"
 
   "DESCRIPTION			DeLorme XMap/SAHH 2006 Native .TXT\n"
   "EXTENSION			txt\n"
@@ -1425,7 +1425,7 @@ static char xmapwpt[] =
   "# Author: Alex Mottram\n"
   "#   Date: 12/09/2002\n"
   "#\n"
-  "# \n"
+  "#\n"
   "DESCRIPTION 		DeLorme XMat HH Street Atlas USA .WPT (PPC)\n"
   "SHORTLEN		32\n"
   "SHORTWHITE		0\n"
diff --git a/gpsbabel/style/csv.style b/gpsbabel/style/csv.style
index 3129a74fa..c884729e9 100644
--- a/gpsbabel/style/csv.style
+++ b/gpsbabel/style/csv.style
@@ -4,7 +4,7 @@
 # Author: Alex Mottram
 #   Date: 12/09/2002
 #
-# 
+#
 DESCRIPTION	Comma separated values
 SHORTLEN	8
 #
diff --git a/gpsbabel/style/custom.style b/gpsbabel/style/custom.style
index ffdb341a0..528ac85ed 100644
--- a/gpsbabel/style/custom.style
+++ b/gpsbabel/style/custom.style
@@ -47,6 +47,6 @@ IFIELD	LON_INT32DEG, "", "%ld"
 IFIELD	TIMET_TIME, "", "%ld"
 IFIELD	EXCEL_TIME, "", "%f"
 
-# EPILOGUE: 
+# EPILOGUE:
 EPILOGUE	Epilogue Line 1
 EPILOGUE	Epilogue Line 2
diff --git a/gpsbabel/style/dna.style b/gpsbabel/style/dna.style
index 5cbacbec8..470536057 100644
--- a/gpsbabel/style/dna.style
+++ b/gpsbabel/style/dna.style
@@ -4,7 +4,7 @@
 # Author: Alex Mottram
 #   Date: 12/09/2002
 #
-# 
+#
 # As defined in dna.c
 #
 #
diff --git a/gpsbabel/style/fugawi.style b/gpsbabel/style/fugawi.style
index e47b38966..aa1d5b2db 100644
--- a/gpsbabel/style/fugawi.style
+++ b/gpsbabel/style/fugawi.style
@@ -4,7 +4,7 @@
 # Author: Robert Lipe, Patrick Ohly
 #   Date: 07/24/2005
 #
-# 
+#
 
 DESCRIPTION		Fugawi
 EXTENSION		txt
diff --git a/gpsbabel/style/garmin301.style b/gpsbabel/style/garmin301.style
index 57e199ad8..6c7a73956 100644
--- a/gpsbabel/style/garmin301.style
+++ b/gpsbabel/style/garmin301.style
@@ -17,7 +17,7 @@ BADCHARS		COMMA
 #
 # HEADER STUFF:
 #
-PROLOGUE	Garmin 301 data __FILE__ 
+PROLOGUE	Garmin 301 data __FILE__
 PROLOGUE	Timestamp,Latitude, Longitude, Altitude(ft), heart rate
 #
 # INDIVIDUAL DATA FIELDS:
@@ -29,6 +29,6 @@ IFIELD	ALT_FEET, "", "%fF"
 IFIELD  HEART_RATE,""," %d"	# beats per minute
 
 
-# EPILOGUE: 
+# EPILOGUE:
 #EPILOGUE	Epilogue Line 1
 #EPILOGUE	Epilogue Line 2
diff --git a/gpsbabel/style/garmin_g1000.style b/gpsbabel/style/garmin_g1000.style
index 2529fbdff..1855563cd 100644
--- a/gpsbabel/style/garmin_g1000.style
+++ b/gpsbabel/style/garmin_g1000.style
@@ -21,80 +21,80 @@ DATATYPE TRACK
 #
 # HEADER
 #
-PROLOGUE airframe_info, log_version="1.00", airframe_name="Cessna 182T", unit_software_part_number="", unit_software_version="12.03", system_software_part_number="", system_id="", mode=NORMAL, 
+PROLOGUE airframe_info, log_version="1.00", airframe_name="Cessna 182T", unit_software_part_number="", unit_software_version="12.03", system_software_part_number="", system_id="", mode=NORMAL,
 PROLOGUE yyyy-mm-dd, hh:mm:ss,   hh:mm,  ident,      degrees,      degrees, ft Baro,  inch,  ft msl, deg C,     kt,     kt,     fpm,    deg,    deg,      G,      G,   deg,   deg, volts, volts,  amps,  amps,   gals,   gals,      gph,   deg F,     psi,     Hg,    rpm,   deg F,   deg F,   deg F,   deg F,   deg F,   deg F,   deg F,   deg F,   deg F,   deg F,   deg F,   deg F,  ft wgs,  kt, enum,    deg,    MHz,    MHz,     MHz,     MHz,    fsd,    fsd,     kt,   deg,     nm,    deg,    deg,   bool,  enum,   enum,   deg,   deg,   fpm,   enum,   mt,    mt,     mt,    mt,     mt
 PROLOGUE Lcl Date, Lcl Time, UTCOfst, AtvWpt,     Latitude,    Longitude,    AltB, BaroA,  AltMSL,   OAT,    IAS, GndSpd,    VSpd,  Pitch,   Roll,  LatAc, NormAc,   HDG,   TRK, volt1, volt2,  amp1,  amp2,  FQtyL,  FQtyR, E1 FFlow, E1 OilT, E1 OilP, E1 MAP, E1 RPM, E1 CHT1, E1 CHT2, E1 CHT3, E1 CHT4, E1 CHT5, E1 CHT6, E1 EGT1, E1 EGT2, E1 EGT3, E1 EGT4, E1 EGT5, E1 EGT6,  AltGPS, TAS, HSIS,    CRS,   NAV1,   NAV2,    COM1,    COM2,   HCDI,   VCDI, WndSpd, WndDr, WptDst, WptBrg, MagVar, AfcsOn, RollM, PitchM, RollC, PichC, VSpdG, GPSfix,  HAL,   VAL, HPLwas, HPLfd, VPLwas
 
 #
 # INDIVIDUAL DATA FIELDS:
 #
-IFIELD GMT_TIME,"","%Y-%m-%d" 		#Lcl Date, 
-IFIELD HMSG_TIME,"","%d:%d:%d %s"  	#Lcl Time, 
-IFIELD IGNORE,"","%s"  				#UTCOfst, 
-IFIELD IGNORE,"","%s"  				#AtvWpt,     
-IFIELD LAT_DECIMAL, "", "%f"  		#Latitude,    
-IFIELD LON_DECIMAL, "", "%f"  		#Longitude,    
-IFIELD ALT_FEET,"","%.0f"  			#AltB, 
-IFIELD IGNORE,"","%s"  				#BaroA,  
-IFIELD IGNORE,"","%s"  				#AltMSL,   
-IFIELD IGNORE,"","%s"  				#OAT,    
-IFIELD IGNORE,"","%s"  				#IAS, 
-IFIELD IGNORE,"","%s"  				#GndSpd,    
-IFIELD IGNORE,"","%s"  				#VSpd,  
-IFIELD IGNORE,"","%s"  				#Pitch,   
-IFIELD IGNORE,"","%s"  				#Roll,  
-IFIELD IGNORE,"","%s"  				#LatAc, 
-IFIELD IGNORE,"","%s"  				#NormAc,   
-IFIELD IGNORE,"","%s"  				#HDG,   
-IFIELD IGNORE,"","%s"  				#TRK, 
-IFIELD IGNORE,"","%s"  				#volt1, 
-IFIELD IGNORE,"","%s"  				#volt2,  
-IFIELD IGNORE,"","%s"  				#amp1,  
-IFIELD IGNORE,"","%s"  				#amp2,  
-IFIELD IGNORE,"","%s"  				#FQtyL,  
-IFIELD IGNORE,"","%s"  				#FQtyR, 
-IFIELD IGNORE,"","%s"  				#E1 FFlow, 
-IFIELD IGNORE,"","%s"  				#E1 OilT, 
-IFIELD IGNORE,"","%s"  				#E1 OilP, 
-IFIELD IGNORE,"","%s"  				#E1 MAP, 
-IFIELD IGNORE,"","%s"  				#E1 RPM, 
-IFIELD IGNORE,"","%s"  				#E1 CHT1, 
-IFIELD IGNORE,"","%s"  				#E1 CHT2, 
-IFIELD IGNORE,"","%s"  				#E1 CHT3, 
-IFIELD IGNORE,"","%s"  				#E1 CHT4, 
-IFIELD IGNORE,"","%s"  				#E1 CHT5, 
-IFIELD IGNORE,"","%s"  				#E1 CHT6, 
-IFIELD IGNORE,"","%s"  				#E1 EGT1, 
-IFIELD IGNORE,"","%s"  				#E1 EGT2, 
-IFIELD IGNORE,"","%s" 			 	#E1 EGT3, 
-IFIELD IGNORE,"","%s"  				#E1 EGT4, 
-IFIELD IGNORE,"","%s"  				#E1 EGT5, 
-IFIELD IGNORE,"","%s"  				#E1 EGT6,  
-IFIELD IGNORE,"","%s"  				#E1 TIT1,  
-IFIELD IGNORE,"","%s"  				#AltGPS, 
-IFIELD IGNORE,"","%s"  				#TAS, 
-IFIELD IGNORE,"","%s"  				#HSIS,    
-IFIELD IGNORE,"","%s"  				#CRS,   
-IFIELD IGNORE,"","%s"  				#NAV1,   
-IFIELD IGNORE,"","%s"  				#NAV2,    
-IFIELD IGNORE,"","%s"  				#COM1,    
-IFIELD IGNORE,"","%s"  				#COM2,   
-IFIELD IGNORE,"","%s"  				#HCDI,   
-IFIELD IGNORE,"","%s"  				#VCDI, 
-IFIELD IGNORE,"","%s" 				#WndSpd, 
-IFIELD IGNORE,"","%s"  				#WndDr, 
-IFIELD IGNORE,"","%s"  				#WptDst, 
-IFIELD IGNORE,"","%s"  				#WptBrg, 
-IFIELD IGNORE,"","%s"  				#MagVar, 
-IFIELD IGNORE,"","%s"  				#AfcsOn, 
-IFIELD IGNORE,"","%s"  				#RollM, 
-IFIELD IGNORE,"","%s"  				#PitchM, 
-IFIELD IGNORE,"","%s"  				#RollC, 
-IFIELD IGNORE,"","%s"  				#PichC, 
-IFIELD IGNORE,"","%s"  				#VSpdG, 
-IFIELD IGNORE,"","%s"  				#GPSfix,  
-IFIELD IGNORE,"","%s"  				#HAL,   
-IFIELD IGNORE,"","%s"  				#VAL, 
-IFIELD IGNORE,"","%s"  				#HPLwas, 
-IFIELD IGNORE,"","%s"  				#HPLfd, 
+IFIELD GMT_TIME,"","%Y-%m-%d" 		#Lcl Date,
+IFIELD HMSG_TIME,"","%d:%d:%d %s"  	#Lcl Time,
+IFIELD IGNORE,"","%s"  				#UTCOfst,
+IFIELD IGNORE,"","%s"  				#AtvWpt,
+IFIELD LAT_DECIMAL, "", "%f"  		#Latitude,
+IFIELD LON_DECIMAL, "", "%f"  		#Longitude,
+IFIELD ALT_FEET,"","%.0f"  			#AltB,
+IFIELD IGNORE,"","%s"  				#BaroA,
+IFIELD IGNORE,"","%s"  				#AltMSL,
+IFIELD IGNORE,"","%s"  				#OAT,
+IFIELD IGNORE,"","%s"  				#IAS,
+IFIELD IGNORE,"","%s"  				#GndSpd,
+IFIELD IGNORE,"","%s"  				#VSpd,
+IFIELD IGNORE,"","%s"  				#Pitch,
+IFIELD IGNORE,"","%s"  				#Roll,
+IFIELD IGNORE,"","%s"  				#LatAc,
+IFIELD IGNORE,"","%s"  				#NormAc,
+IFIELD IGNORE,"","%s"  				#HDG,
+IFIELD IGNORE,"","%s"  				#TRK,
+IFIELD IGNORE,"","%s"  				#volt1,
+IFIELD IGNORE,"","%s"  				#volt2,
+IFIELD IGNORE,"","%s"  				#amp1,
+IFIELD IGNORE,"","%s"  				#amp2,
+IFIELD IGNORE,"","%s"  				#FQtyL,
+IFIELD IGNORE,"","%s"  				#FQtyR,
+IFIELD IGNORE,"","%s"  				#E1 FFlow,
+IFIELD IGNORE,"","%s"  				#E1 OilT,
+IFIELD IGNORE,"","%s"  				#E1 OilP,
+IFIELD IGNORE,"","%s"  				#E1 MAP,
+IFIELD IGNORE,"","%s"  				#E1 RPM,
+IFIELD IGNORE,"","%s"  				#E1 CHT1,
+IFIELD IGNORE,"","%s"  				#E1 CHT2,
+IFIELD IGNORE,"","%s"  				#E1 CHT3,
+IFIELD IGNORE,"","%s"  				#E1 CHT4,
+IFIELD IGNORE,"","%s"  				#E1 CHT5,
+IFIELD IGNORE,"","%s"  				#E1 CHT6,
+IFIELD IGNORE,"","%s"  				#E1 EGT1,
+IFIELD IGNORE,"","%s"  				#E1 EGT2,
+IFIELD IGNORE,"","%s" 			 	#E1 EGT3,
+IFIELD IGNORE,"","%s"  				#E1 EGT4,
+IFIELD IGNORE,"","%s"  				#E1 EGT5,
+IFIELD IGNORE,"","%s"  				#E1 EGT6,
+IFIELD IGNORE,"","%s"  				#E1 TIT1,
+IFIELD IGNORE,"","%s"  				#AltGPS,
+IFIELD IGNORE,"","%s"  				#TAS,
+IFIELD IGNORE,"","%s"  				#HSIS,
+IFIELD IGNORE,"","%s"  				#CRS,
+IFIELD IGNORE,"","%s"  				#NAV1,
+IFIELD IGNORE,"","%s"  				#NAV2,
+IFIELD IGNORE,"","%s"  				#COM1,
+IFIELD IGNORE,"","%s"  				#COM2,
+IFIELD IGNORE,"","%s"  				#HCDI,
+IFIELD IGNORE,"","%s"  				#VCDI,
+IFIELD IGNORE,"","%s" 				#WndSpd,
+IFIELD IGNORE,"","%s"  				#WndDr,
+IFIELD IGNORE,"","%s"  				#WptDst,
+IFIELD IGNORE,"","%s"  				#WptBrg,
+IFIELD IGNORE,"","%s"  				#MagVar,
+IFIELD IGNORE,"","%s"  				#AfcsOn,
+IFIELD IGNORE,"","%s"  				#RollM,
+IFIELD IGNORE,"","%s"  				#PitchM,
+IFIELD IGNORE,"","%s"  				#RollC,
+IFIELD IGNORE,"","%s"  				#PichC,
+IFIELD IGNORE,"","%s"  				#VSpdG,
+IFIELD IGNORE,"","%s"  				#GPSfix,
+IFIELD IGNORE,"","%s"  				#HAL,
+IFIELD IGNORE,"","%s"  				#VAL,
+IFIELD IGNORE,"","%s"  				#HPLwas,
+IFIELD IGNORE,"","%s"  				#HPLfd,
 IFIELD IGNORE,"","%s"  				#VPLwas
diff --git a/gpsbabel/style/gpsdrive.style b/gpsbabel/style/gpsdrive.style
index dfe80ccaa..2084054df 100644
--- a/gpsbabel/style/gpsdrive.style
+++ b/gpsbabel/style/gpsdrive.style
@@ -4,7 +4,7 @@
 # Author: Alex Mottram
 #   Date: 12/11/2002
 #
-# 
+#
 #
 
 DESCRIPTION		GpsDrive Format
diff --git a/gpsbabel/style/gpsdrivetrack.style b/gpsbabel/style/gpsdrivetrack.style
index a23e14174..1a30052a1 100644
--- a/gpsbabel/style/gpsdrivetrack.style
+++ b/gpsbabel/style/gpsdrivetrack.style
@@ -4,7 +4,7 @@
 # Author: Tobias Minich
 #   Date: 12/07/2005
 #
-# 
+#
 #
 
 DESCRIPTION		GpsDrive Format for Tracks
diff --git a/gpsbabel/style/gpsman.style b/gpsbabel/style/gpsman.style
index e1046dcce..e8d1e366c 100644
--- a/gpsbabel/style/gpsman.style
+++ b/gpsbabel/style/gpsman.style
@@ -4,7 +4,7 @@
 # Author: Alex Mottram
 #   Date: 12/09/2002
 #
-# 
+#
 # As defined in gpsman.c
 #
 #
diff --git a/gpsbabel/style/kompass_tk.style b/gpsbabel/style/kompass_tk.style
index 2b6ffaff9..0bc0b0790 100644
--- a/gpsbabel/style/kompass_tk.style
+++ b/gpsbabel/style/kompass_tk.style
@@ -4,7 +4,7 @@
 # Author: Olaf Klein
 #   Date: 01/10/2007
 #
-# 
+#
 DESCRIPTION		Kompass (DAV) Track (.tk)
 DATATYPE		TRACK
 EXTENSION		wp
diff --git a/gpsbabel/style/kompass_wp.style b/gpsbabel/style/kompass_wp.style
index 2f4db451f..e50ab3405 100644
--- a/gpsbabel/style/kompass_wp.style
+++ b/gpsbabel/style/kompass_wp.style
@@ -4,7 +4,7 @@
 # Author: Olaf Klein
 #   Date: 01/10/2007
 #
-# 
+#
 DESCRIPTION		Kompass (DAV) Waypoints (.wp)
 DATATYPE		WAYPOINT
 EXTENSION		wp
diff --git a/gpsbabel/style/mainnav.style b/gpsbabel/style/mainnav.style
index 4ac47608c..a38054863 100644
--- a/gpsbabel/style/mainnav.style
+++ b/gpsbabel/style/mainnav.style
@@ -22,7 +22,7 @@
 # Author: tsteven4
 # Date: December 13, 2012
 #
-# 
+#
 DESCRIPTION	Mainnav
 EXTENSION	nav
 DATATYPE	TRACK
diff --git a/gpsbabel/style/mxf.style b/gpsbabel/style/mxf.style
index 08d35e7d6..9d4034e46 100644
--- a/gpsbabel/style/mxf.style
+++ b/gpsbabel/style/mxf.style
@@ -4,7 +4,7 @@
 # Author: Alex Mottram
 #   Date: 12/09/2002
 #
-# 
+#
 # As used in mxf.c
 #
 #
diff --git a/gpsbabel/style/nima.style b/gpsbabel/style/nima.style
index f0562db59..880fb0b0a 100644
--- a/gpsbabel/style/nima.style
+++ b/gpsbabel/style/nima.style
@@ -39,7 +39,7 @@ IFIELD	IGNORE, "", "%s"		# NT
 IFIELD	IGNORE, "", "%s"		# LC
 IFIELD	IGNORE, "", "%s"		# SHORT_FORM
 IFIELD	IGNORE, "", "%s"		# GENERIC
-IFIELD	SHORTNAME, "", "%s"		# SORT_NAME 
+IFIELD	SHORTNAME, "", "%s"		# SORT_NAME
 IFIELD	IGNORE, "", "%s"		# FULL_NAME (unicoded!)
 IFIELD	DESCRIPTION, "", "%s"		# FULL_NAME_ND
 IFIELD	IGNORE, "", "%s"		# MODIFY_DATE
diff --git a/gpsbabel/style/s_and_t.style b/gpsbabel/style/s_and_t.style
index dbc61c741..ce0610cd5 100644
--- a/gpsbabel/style/s_and_t.style
+++ b/gpsbabel/style/s_and_t.style
@@ -4,7 +4,7 @@
 # Author: Alex Mottram
 #   Date: 12/09/2002
 #
-# 
+#
 # As requested by Noel Shrum on the gpsbabel-code mailing list.
 # Name,Latitude,Longitude,Name 2,URL,Type
 # GCCBF,44.479133,-85.56515,High Rollaway by rjlint,http://www.geocaching.com/seek/cache_details.aspx?ID=3263,Traditional Cache
diff --git a/gpsbabel/style/saplus.style b/gpsbabel/style/saplus.style
index 26f24b65b..76da425b1 100644
--- a/gpsbabel/style/saplus.style
+++ b/gpsbabel/style/saplus.style
@@ -1,6 +1,6 @@
 # gpsbabel XCSV style file
 #
-# Format: 
+# Format:
 # Author: Jim Bensman
 #   Date: 02/22/04
 #
diff --git a/gpsbabel/style/tabsep.style b/gpsbabel/style/tabsep.style
index 65d0f31d4..1dd43bbdc 100644
--- a/gpsbabel/style/tabsep.style
+++ b/gpsbabel/style/tabsep.style
@@ -28,7 +28,7 @@ IFIELD	INDEX, "", "%d"
 IFIELD	SHORTNAME, "", "%s"
 IFIELD	DESCRIPTION, "", "%s"
 IFIELD	NOTES, "", "%s"
-IFIELD	URL, "", "%s" 		
+IFIELD	URL, "", "%s"
 IFIELD	URL_LINK_TEXT, "", "%s"
 IFIELD	ICON_DESCR, "", "%s"
 IFIELD	LAT_DECIMAL, "", "%f"
diff --git a/gpsbabel/style/xmap.style b/gpsbabel/style/xmap.style
index 96a2246d6..6baa463af 100644
--- a/gpsbabel/style/xmap.style
+++ b/gpsbabel/style/xmap.style
@@ -4,7 +4,7 @@
 # Author: Alex Mottram
 #   Date: 12/09/2002
 #
-# 
+#
 # As defined in csv.c/xmap
 #
 
diff --git a/gpsbabel/style/xmap2006.style b/gpsbabel/style/xmap2006.style
index 7b4ce2380..3d9e0f4d1 100644
--- a/gpsbabel/style/xmap2006.style
+++ b/gpsbabel/style/xmap2006.style
@@ -4,10 +4,10 @@
 # Author: Pasha Phares
 #   Date: 5/5/2006
 #
-# Amazingly, 2006 won't read the "COMMASPACE" that we used in 
+# Amazingly, 2006 won't read the "COMMASPACE" that we used in
 # in Xmap prior to this and versions before 2006 won't read files
 # separated by only a comma.
-# 
+#
 
 DESCRIPTION			DeLorme XMap/SAHH 2006 Native .TXT
 EXTENSION			txt
diff --git a/gpsbabel/style/xmapwpt.style b/gpsbabel/style/xmapwpt.style
index f6dd56337..d3444fe08 100644
--- a/gpsbabel/style/xmapwpt.style
+++ b/gpsbabel/style/xmapwpt.style
@@ -4,7 +4,7 @@
 # Author: Alex Mottram
 #   Date: 12/09/2002
 #
-# 
+#
 DESCRIPTION 		DeLorme XMat HH Street Atlas USA .WPT (PPC)
 SHORTLEN		32
 SHORTWHITE		0